Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 15 Dec 2011 04:17:47 +0000 (20:17 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 15 Dec 2011 04:17:47 +0000 (20:17 -0800)

Trivial merge